Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cFE Integration candidate: 2021-06-01 #1584

Merged
merged 48 commits into from
Jun 8, 2021
Merged

cFE Integration candidate: 2021-06-01 #1584

merged 48 commits into from
Jun 8, 2021

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented May 27, 2021

Context

Part of nasa/cFS#263

Tests

cFE Checks https://github.com/nasa/cFE/pull/1584/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/263/checks

Note CodeQL failure in cFE checks because workflow points at "main". This is resolved by the cFS-bundle IC.

Authors

@pepepr08
@ArielSAdamsNASA
@jphickey
@skliper

Description

PR #1580

Fix #1364, Update ES verify errors to match

Ensures error messages in cfe_es_verify.h match test logic.

PR #1578

Fix #1366, Resolve mismatched endforeach of CMakeList.txt

PR #1579

Fix #1390, Improve event filter documentation

Adds documentation for the behavior of CFE_EVS_ResetFilter and explains how Event Filter Mask Values work.

PR #1576

Fix #1391, EVS/FS documentation cleanup

PR #1575

Fix #1394, Remove shell file subtype and clarify scope

Removes CFE_FS_SubType_ES_SHELL and clarifies the scope of CFE_FS_SubType_Enum_t so that it only includes the cFE-defined file types

PR #1582

Fix #1362, Simplify CFE_ES_QueryAllCmd file open logic

Removes the obsolete OS_OpenCreate and file-remove-on-success logic from CFE_ES_QueryAllCmd.

PR #1567

Fix #1423, Remove deprecated elements

PR #1556

Fix #1441, Replace Header Content Type magic number.

PR #1553

Fix #1446, Remove unused EVS LogMode defines

PR #1570

Fix #1452, #1569, SB/MSG/SBR documentation cleanup and remove unused CFE_SB_NO_SUBSCRIBERS

PR #1565

Fix #1455, Add CFE_SB_DestinationD tag and use for pointersastrogeco

PR #1564

Fix #1476, Use CFE_MSG_SequenceCount_t for seqcnt type

PR #1562

Fix #1485, Document CFE_ES_PoolCreateEx NumBlockSizes error handling

PR #1560

Fix #1494, Documentation cleanup in TBL/TIME

PR #1558

Fix #1507, Document TblName as app specific

PR #1563

Fix #1561, use OSAL script to generate API guide

PR #1557

Fix #1548, Include verify headers to validate config

PR #1555

Fix #1554, add doxygen aliases for OSAL parameter/retvals

pepepr08 and others added 30 commits May 18, 2021 14:43
Adds "nonnull", "nonzero", and "covtest" tags to mark parameters
and return values in documentation.  This info is helpful when
auditing the test cases.
Instead of including the OSAL API guide templates and pages
in the CFE repo, invoke the build script now provided in
the OSAL repo itself.
- Removed requirement cEVS3101
- Removed documentation references
- Removed from API header
- Removed stub
- Removed implementation
- Removed coverage test
- Updated CFE_ES_QueryAllCmd handler
- Updated CFE_ES_QueryAllTasksCmd handler
Fix #1364, Update ES verify errors to match test
Fix #1366, Resolve mismatched endforeach of CMakeList.txt
Fix #1390, Improve event filter documentation
Fix #1394, Remove shell file subtype and clarify scope
Fix #1362, Simplify CFE_ES_QueryAllCmd file open logic
Fix #1476, Use CFE_MSG_SequenceCount_t for seqcnt type
Fix #1485, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
astrogeco added a commit to nasa/cFS that referenced this pull request May 27, 2021
nasa/cFE#1584

Includes:

nasa/cFE#1580, Update ES verify errors to match test
nasa/cFE#1578, Resolve mismatched endforeach of CMakeList.txt
nasa/cFE#1579, Improve event filter documentation
nasa/cFE#1576, EVS/FS documentation cleanup
nasa/cFE#1575, Remove shell file subtype and clarify scope
nasa/cFE#1582, Simplify file open/truncate logic
nasa/cFE#1567, Remove deprecated elements
nasa/cFE#1556, Replace Header Content Type magic number
nasa/cFE#1553, Remove unused EVS LogMode defines
nasa/cFE#1570, Document cleanup from SB/MSG/SBR review, Remove unused CFE_SB_NO_SUBSCRIBERS
nasa/cFE#1565, Add CFE_SB_DestinationD tag and use for pointers
nasa/cFE#1564, Use CFE_MSG_SequenceCount_t for seqcnt type
nasa/cFE#1562, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
nasa/cFE#1560, Documentation cleanup in TBL/TIME
nasa/cFE#1558, Document TblName as app specific
Fix #1561, use OSAL script to generate API guide
astrogeco added a commit to nasa/cFS that referenced this pull request May 27, 2021
#263

Combines

nasa/cFE#1584
nasa/osal#1058

Includes:

nasa/cFE#1563, use OSAL script to generate API guide

nasa/osal#1033, include doxygen targets locally
astrogeco added a commit to nasa/cFS that referenced this pull request Jun 1, 2021
nasa/cFE#1584

Includes:

nasa/cFE#1580, Update ES verify errors to match test
nasa/cFE#1578, Resolve mismatched endforeach of CMakeList.txt
nasa/cFE#1579, Improve event filter documentation
nasa/cFE#1576, EVS/FS documentation cleanup
nasa/cFE#1575, Remove shell file subtype and clarify scope
nasa/cFE#1582, Simplify file open/truncate logic
nasa/cFE#1567, Remove deprecated elements
nasa/cFE#1556, Replace Header Content Type magic number
nasa/cFE#1553, Remove unused EVS LogMode defines
nasa/cFE#1570, Document cleanup from SB/MSG/SBR review, Remove unused CFE_SB_NO_SUBSCRIBERS
nasa/cFE#1565, Add CFE_SB_DestinationD tag and use for pointers
nasa/cFE#1564, Use CFE_MSG_SequenceCount_t for seqcnt type
nasa/cFE#1562, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
nasa/cFE#1560, Documentation cleanup in TBL/TIME
nasa/cFE#1558, Document TblName as app specific
astrogeco added a commit to nasa/cFS that referenced this pull request Jun 1, 2021
#263

Combines

nasa/cFE#1584
nasa/osal#1058

Includes:

nasa/cFE#1563, use OSAL script to generate API guide

nasa/osal#1033, include doxygen targets locally
Fix #1548, Include verify headers to validate config
astrogeco added a commit to nasa/cFS that referenced this pull request Jun 2, 2021
Updates nasa/cFE#1584 and nasa/osal#1058

Includes

nasa/osal#962, update OSAL Config Guide link

nasa/cFE#1557, Include verify headers to validate config
…d-codeql

Fix #1512, Add Coding Standard Rules in CodeQL
Fix #1585, Fix Calculate CRC header return description.
Fix #1435, Consistent use of uint16 for EventID
@astrogeco
Copy link
Contributor Author

astrogeco commented Jun 3, 2021

@jphickey getting a strange cmake error in the CodeQL workflows

CMake Error at cmake/arch_build.cmake:45 (file): file failed to open for reading (No such file or directory):

Run cp ./cfe/cmake/Makefile.sample Makefile
mkdir -p "build"
(cd "build" && cmake  -DCMAKE_INSTALL_PREFIX=/exe -DCMAKE_BUILD_TYPE=release "/home/runner/work/cFE/cFE/cfe")
-- The C compiler identification is GNU 7.5.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Mission configuration sample automatically selected
-- OMIT_DEPRECATED=true: Not including deprecated elements in build
-- Search path for modules: apps;libs;psp/fsw/modules;cfe/modules
-- Module 'core_api' found at /home/runner/work/cFE/cFE/cfe/modules/core_api
-- Module 'core_private' found at /home/runner/work/cFE/cFE/cfe/modules/core_private
-- Module 'ci_lab' found at /home/runner/work/cFE/cFE/apps/ci_lab
-- Module 'to_lab' found at /home/runner/work/cFE/cFE/apps/to_lab
-- Module 'sch_lab' found at /home/runner/work/cFE/cFE/apps/sch_lab
-- Module 'cfe_assert' found at /home/runner/work/cFE/cFE/cfe/modules/cfe_assert
-- Module 'cfe_testcase' found at /home/runner/work/cFE/cFE/cfe/modules/cfe_testcase
-- Module 'sample_app' found at /home/runner/work/cFE/cFE/apps/sample_app
-- Module 'sample_lib' found at /home/runner/work/cFE/cFE/apps/sample_lib
-- Module 'es' found at /home/runner/work/cFE/cFE/cfe/modules/es
-- Module 'evs' found at /home/runner/work/cFE/cFE/cfe/modules/evs
-- Module 'fs' found at /home/runner/work/cFE/cFE/cfe/modules/fs
-- Module 'sb' found at /home/runner/work/cFE/cFE/cfe/modules/sb
-- Module 'tbl' found at /home/runner/work/cFE/cFE/cfe/modules/tbl
-- Module 'time' found at /home/runner/work/cFE/cFE/cfe/modules/time
-- Module 'osal' found at /home/runner/work/cFE/cFE/osal
-- Module 'psp' found at /home/runner/work/cFE/cFE/psp
-- Module 'msg' found at /home/runner/work/cFE/cFE/cfe/modules/msg
-- Module 'sbr' found at /home/runner/work/cFE/cFE/cfe/modules/sbr
-- Module 'resourceid' found at /home/runner/work/cFE/cFE/cfe/modules/resourceid
CMake Error at cmake/mission_build.cmake:314 (add_subdirectory):
  add_subdirectory given source "/home/runner/work/cFE/cFE/osal/doc/src"
  which is not an existing directory.
Call Stack (most recent call first):
  CMakeLists.txt:120 (prepare)


-- Configuring for system arch: native/default_cpu1
-- The C compiler identification is GNU 7.5.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
CMake Error at cmake/arch_build.cmake:45 (file):
  file failed to open for reading (No such file or directory):

Fix #1554, add doxygen aliases for OSAL parameter/retvals

NOTE: Manually merged/propagated to CFE-common resolve warnings
when referencing OSAL headers from CFE usersguide build.
@astrogeco
Copy link
Contributor Author

CMake Error at cmake/arch_build.cmake:45 (file):
  file failed to open for reading (No such file or directory):

    /home/runner/work/cFE/cFE/build/mission_vars.cache
Call Stack (most recent call first):
  CMakeLists.txt:87 (initialize_globals)

astrogeco added a commit to nasa/cFS that referenced this pull request Jun 4, 2021
Combines:

nasa/osal#1058
nasa/cFE#1584
nasa/sch_lab#82

Includes:

nasa/sch_lab#81, exit the main loop if init fails
nasa/cFE#1555, add doxygen aliases for OSAL parameter/retvals
nasa/osal HOTFIX
@astrogeco astrogeco marked this pull request as ready for review June 8, 2021 16:36
astrogeco added a commit to nasa/cFS that referenced this pull request Jun 8, 2021
nasa/cFE#1584 v6.8.0-rc1+dev642
nasa/osal#1058 v5.1.0-rc1+dev500
nasa/sch_lab#82 v2.4.0-rc1+dev36
@astrogeco astrogeco merged commit a16c78e into main Jun 8, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Jun 8, 2021
- #263, bundle

Combines:

- nasa/cFE#1584, v6.8.0-rc1+dev642
- nasa/osal#1058, v5.1.0-rc1+dev500
- nasa/sch_lab#82, v2.4.0-rc1+dev36

Includes:

- nasa/cFE#1580, Update ES verify errors to match test
- nasa/cFE#1578, Resolve mismatched endforeach of CMakeList.txt
- nasa/cFE#1579, Improve event filter documentation
- nasa/cFE#1576, EVS/FS documentation cleanup
- nasa/cFE#1575, Remove shell file subtype and clarify scope
- nasa/cFE#1582, Simplify file open/truncate logic
- nasa/cFE#1567, Remove deprecated elements
- nasa/cFE#1556, Replace Header Content Type magic number
- nasa/cFE#1553, Remove unused EVS LogMode defines
- nasa/cFE#1570, Document cleanup from SB/MSG/SBR review, Remove unused CFE_SB_NO_SUBSCRIBERS
- nasa/cFE#1565, Add CFE_SB_DestinationD tag and use for pointers
- nasa/cFE#1564, Use CFE_MSG_SequenceCount_t for seqcnt type
- nasa/cFE#1562, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
- nasa/cFE#1560, Documentation cleanup in TBL/TIME
- nasa/cFE#1558, Document TblName as app specific
- nasa/cFE#1563, use OSAL script to generate API guide
- nasa/cFE#1557, Include verify headers to validate config
- nasa/cFE#1555, add doxygen aliases for OSAL parameter/retvals

- nasa/osal#1033, include doxygen targets locally
- nasa/osal#1031, Document OS_ObjectIdToArrayIndex as public
- nasa/osal#1040, resolve discrepancies between binsem API and unit tests
- nasa/osal#1029, add missing clock retcode tests
- nasa/osal#1046, resolve discrepancies between common API and unit tests
- nasa/osal#1041, resolve discrepancies between countsem API and unit tests
- nasa/osal#1045, resolve discrepancies between dir API and unit tests
- nasa/osal#1043, resolve discrepancies between module API and unit tests
- nasa/osal#1044, resolve discrepancies between mutex API and unit tests
- nasa/osal#1038, resolve discrepancies between queue API and unit tests
- nasa/osal#1037, resolve discrepancies between task API and unit tests
- nasa/osal#1051, resolve discrepancies between timebase API and unit tests
- nasa/osal#1030, check misc API return codes
- nasa/osal#1039, Rename CodeQL cFE Build and add Duplicate Job
- nasa/osal#1049, filter only whole words for keyword match
- nasa/osal#962, update OSAL Config Guide link

- nasa/sch_lab#81, exit the main loop if init fails

- HOTFIX cFS-bundle, Use new osalguide logfile to fix documentation build
workflow errors,
astrogeco added a commit to nasa/cFS that referenced this pull request Jun 8, 2021
- #263, bundle

Combines:

- nasa/cFE#1584, v6.8.0-rc1+dev642
- nasa/osal#1058, v5.1.0-rc1+dev500
- nasa/sch_lab#82, v2.4.0-rc1+dev36

Includes:

- nasa/cFE#1580, Update ES verify errors to match test
- nasa/cFE#1578, Resolve mismatched endforeach of CMakeList.txt
- nasa/cFE#1579, Improve event filter documentation
- nasa/cFE#1576, EVS/FS documentation cleanup
- nasa/cFE#1575, Remove shell file subtype and clarify scope
- nasa/cFE#1582, Simplify file open/truncate logic
- nasa/cFE#1567, Remove deprecated elements
- nasa/cFE#1556, Replace Header Content Type magic number
- nasa/cFE#1553, Remove unused EVS LogMode defines
- nasa/cFE#1570, Document cleanup from SB/MSG/SBR review, Remove unused CFE_SB_NO_SUBSCRIBERS
- nasa/cFE#1565, Add CFE_SB_DestinationD tag and use for pointers
- nasa/cFE#1564, Use CFE_MSG_SequenceCount_t for seqcnt type
- nasa/cFE#1562, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
- nasa/cFE#1560, Documentation cleanup in TBL/TIME
- nasa/cFE#1558, Document TblName as app specific
- nasa/cFE#1563, use OSAL script to generate API guide
- nasa/cFE#1557, Include verify headers to validate config
- nasa/cFE#1555, add doxygen aliases for OSAL parameter/retvals

- nasa/osal#1033, include doxygen targets locally
- nasa/osal#1031, Document OS_ObjectIdToArrayIndex as public
- nasa/osal#1040, resolve discrepancies between binsem API and unit tests
- nasa/osal#1029, add missing clock retcode tests
- nasa/osal#1046, resolve discrepancies between common API and unit tests
- nasa/osal#1041, resolve discrepancies between countsem API and unit tests
- nasa/osal#1045, resolve discrepancies between dir API and unit tests
- nasa/osal#1043, resolve discrepancies between module API and unit tests
- nasa/osal#1044, resolve discrepancies between mutex API and unit tests
- nasa/osal#1038, resolve discrepancies between queue API and unit tests
- nasa/osal#1037, resolve discrepancies between task API and unit tests
- nasa/osal#1051, resolve discrepancies between timebase API and unit tests
- nasa/osal#1030, check misc API return codes
- nasa/osal#1039, Rename CodeQL cFE Build and add Duplicate Job
- nasa/osal#1049, filter only whole words for keyword match
- nasa/osal#962, update OSAL Config Guide link

- nasa/sch_lab#81, exit the main loop if init fails

- HOTFIX cFS-bundle, Use new osalguide logfile to fix documentation build
workflow errors,

Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored-by: Jake Hageman skliper <skliper@users.noreply.github.com>
Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com>
Co-authored-by: Ariel Adams <ArielSAdamsNASA@users.noreply.github.com>
Co-authored-by: Ross Peters <rosspeters6@users.noreply.github.com>
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment